Merge tag 'upstream/2016.4' into debian/master
authorSimon McVittie <smcv@debian.org>
Mon, 28 Mar 2016 11:33:21 +0000 (12:33 +0100)
committerSimon McVittie <smcv@debian.org>
Mon, 28 Mar 2016 11:33:21 +0000 (12:33 +0100)
commitcce1f8bc5267eecc3fc59d9bfca466a486306cb7
tree72839cfa8bb75dfa8407e621a9bedc09e38ee460
parentc6505155210d1957024dffd22c03ac8dad716c01
parent36b5deae489b75c5b14113d82123b5b776babae4
Merge tag 'upstream/2016.4' into debian/master

Upstream version 2016.4